Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 17:37:57 +0000 (20:37 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Mar 2013 17:37:57 +0000 (20:37 +0300)
commit50c4f47522f1e03ca8ef2a07d908114e63e13498
treee132b9da4785516207fbf07242d1f2ea81f9481f
parentcc978cc5ebd34b338ea00d8aa9a3adb83f09fb96
parentc3e6f448cf90fd535acf7a5d20327c1389b76fab
Merge from trunk.